paned: Fixup recent commit
authorBenjamin Otte <otte@redhat.com>
Wed, 1 May 2013 21:26:27 +0000 (23:26 +0200)
committerBenjamin Otte <otte@redhat.com>
Wed, 1 May 2013 21:26:27 +0000 (23:26 +0200)
d90e3670cef44c688763f15d5695f84ebe985855 had a bunch of embarrassing
bugs.

Fixes paned-undersized reftest.

gtk/gtkpaned.c

index f18e2d84ec71d462e8740748d9360e198029fd33..7f976e64ce2db228b5bf6fb7dabe666e4ab88f07 100644 (file)
@@ -911,17 +911,19 @@ gtk_paned_compute_position (GtkPaned *paned,
            pos = priv->child1_size + allocation - priv->last_allocation;
          else if (!(!priv->child1_resize && priv->child2_resize))
            pos = allocation * ((gdouble) priv->child1_size / (priv->last_allocation)) + 0.5;
+          else
+            pos = priv->child1_size;
        }
       else
-        pos = min;
+        pos = priv->child1_size;
     }
 
   pos = CLAMP (pos, min, max);
   
   if (min_pos)
-    *min_pos = pos;
+    *min_pos = min;
   if (max_pos)
-    *max_pos = pos;
+    *max_pos = max;
   if (out_pos)
     *out_pos = pos;
 }